Darn. I can't believe this took this long to fix.

Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
	I can't believe this took this long to fix.

diff --git a/ChangeLog b/ChangeLog
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bd74dc9521800849c15d06ca4f482ed945c9ac9f..eadf46f555e5a99056723ed179055917ac35fc4d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Oct 29 15:41:58 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn.
+       I can't believe this took this long to fix.
+
 Mon Oct 29 13:54:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered): fix

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 77182774b5fc706a2f06d1a6efe1ea9eefa709e4..91412b12e88589acd43c5da5de479cf581c241b5 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -271,6 +271,20 @@ has the focus.
 </para>
 
 
+<!-- ##### MACRO GTK_IS_TIPS_QUERY ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+<!-- ##### MACRO GTK_IS_TIPS_QUERY_CLASS ##### -->
+<para>
+
+</para>
+
+@klass: 
+
 <!-- ##### MACRO GTK_OBJECT_CONSTRUCTED ##### -->
 <para>
 Test whether a GtkObject's arguments have been prepared.
@@ -328,6 +342,27 @@ Get the array of signals defined for this object.
 </para>
 
 
+<!-- ##### MACRO GTK_TIPS_QUERY ##### -->
+<para>
+
+</para>
+
+@obj: 
+
+<!-- ##### MACRO GTK_TIPS_QUERY_CLASS ##### -->
+<para>
+
+</para>
+
+@klass: 
+
+<!-- ##### MACRO GTK_TIPS_QUERY_GET_CLASS ##### -->
+<para>
+
+</para>
+
+@obj: 
+
 <!-- ##### MACRO GTK_TREE_MODEL_GET_IFACE ##### -->
 <para>
 
@@ -393,6 +428,12 @@ The last structured enumerated type value.
 </para>
 
 
+<!-- ##### MACRO GTK_TYPE_TIPS_QUERY ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO GTK_TYPE_TREE_COLUMN ##### -->
 <para>
 
@@ -2512,6 +2553,13 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
 @width: 
 @height: 
 
+<!-- ##### FUNCTION gtk_tips_query_get_type ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
 <!-- ##### FUNCTION gtk_trace_referencing ##### -->
 <para>
 Private: print debugging information while doing a gtk_object_ref() or 

diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml
index 4dc152d062e0a8e951d5c30fe8ca9796210f875a..de1877ace7515c1fb23c16150ebeb06869c4feff 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkcontainer.sgml
+++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml
@@ -44,6 +44,7 @@ Does the same as gtk_container_get_border_width().
 </para>
 
 
+
 <!-- ##### FUNCTION gtk_container_add ##### -->
 <para>
 

diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index 9b7f8a67012a4607fb0903c2aad2dc7a771cf16d..76b4e863985086bdf21a70b9753ed33c3e382c8f 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -122,7 +122,7 @@ Emits the "activate" signal on the given item
 Emits the "toggle_size_request" signal on the given item.
 </para>
 
-@menu_item: the menu item 
+@menu_item: the menu item
 @requisition: the requisition to use as signal data.
 
 
@@ -131,7 +131,7 @@ Emits the "toggle_size_request" signal on the given item.
 Emits the "toggle_size_allocate" signal on the given item.
 </para>
 
-@menu_item: the menu item. 
+@menu_item: the menu item.
 @allocation: the allocation to use as signal data.
 
 

diff --git a/docs/reference/gtk/tmpl/gtkmenushell.sgml b/docs/reference/gtk/tmpl/gtkmenushell.sgml
index de3e66a93269dcb6e37ba3d92f51928f4d325f0f..fc64ef33df4962d5f7daf94a8b802a73262074a6 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkmenushell.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenushell.sgml
@@ -94,7 +94,7 @@ Selects the menu item from the menu shell.
 Deselects the currently selected item from the menu shell, if any.
 </para>
 
-@menu_shell: a #GtkMenuShell. 
+@menu_shell: a #GtkMenuShell.
 
 
 <!-- ##### FUNCTION gtk_menu_shell_activate_item ##### -->

diff --git a/docs/reference/gtk/tmpl/gtkpreview.sgml b/docs/reference/gtk/tmpl/gtkpreview.sgml
index 7fa78ca6b718b32286e81a9fd560aafeebc3e145..3ec4eff4a08a10b820f3f56c8035c6b69ad965ec 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkpreview.sgml
+++ b/docs/reference/gtk/tmpl/gtkpreview.sgml
@@ -63,8 +63,6 @@ an application.)
 
 </para>
 
-@visual: 
-@cmap: 
 @lookup: 
 @gamma: 
 

diff --git a/docs/reference/gtk/tmpl/gtktipsquery.sgml b/docs/reference/gtk/tmpl/gtktipsquery.sgml
index eb2467af9feb4079fdfea5d8407d8a462c57a00d..a792ce84a90482d497f33230954dc74fcbb318b3 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktipsquery.sgml
+++ b/docs/reference/gtk/tmpl/gtktipsquery.sgml
@@ -97,61 +97,6 @@ the pointer has no tooltip.
 beneath the pointer has no tooltip.
 
 
-<!-- ##### MACRO GTK_TIPS_QUERY ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-
-<!-- ##### MACRO GTK_IS_TIPS_QUERY ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-
-<!-- ##### MACRO GTK_TYPE_TIPS_QUERY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### FUNCTION gtk_tips_query_get_type ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### MACRO GTK_TIPS_QUERY_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-
-<!-- ##### MACRO GTK_IS_TIPS_QUERY_CLASS ##### -->
-<para>
-
-</para>
-
-@klass: 
-
-
-<!-- ##### MACRO GTK_TIPS_QUERY_GET_CLASS ##### -->
-<para>
-
-</para>
-
-@obj: 
-
-
 <!-- ##### SIGNAL GtkTipsQuery::start-query ##### -->
 <para>
 Emitted when the query is started.

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index c353ebccb03ec02d0d5ae84c8a82962b3c8e800a..7945e694ffa852d5326a7360746a73b0c65d13f9 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1412,7 +1412,7 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
        /* isn't supposed to happen */
        break;
 
-      new_order[i] = j;
+      new_order[j] = i;
 
       /* copy ... */
       memcpy (&g_array_index (new_array, SortElt, j), elt1, sizeof (SortElt));